Merge pull request #1347 from dsander/increase-capybara-timeout
Increase capybara default_max_wait_time to 60 seconds
Dominik Sander
3 changed files with 13 additions and 7 deletions
+ 1
- 1
Gemfile
@@ -79,7 +79,7 @@ gem 'protected_attributes', '~>1.0.8' # This must be loaded before some other ge |
||
| 79 | 79 |
gem 'ace-rails-ap', '~> 2.0.1' |
| 80 | 80 |
gem 'bootstrap-kaminari-views', '~> 0.0.3' |
| 81 | 81 |
gem 'bundler', '>= 1.5.0' |
| 82 |
-gem 'coffee-rails', '~> 4.1.0' |
|
| 82 |
+gem 'coffee-rails', '~> 4.1.1' |
|
| 83 | 83 |
gem 'daemons', '~> 1.1.9' |
| 84 | 84 |
gem 'delayed_job', '~> 4.1.0' |
| 85 | 85 |
gem 'delayed_job_active_record', github: 'collectiveidea/delayed_job_active_record', branch: 'master' |
+ 5
- 5
Gemfile.lock
@@ -144,13 +144,13 @@ GEM |
||
| 144 | 144 |
chronic (0.10.2) |
| 145 | 145 |
cliver (0.3.2) |
| 146 | 146 |
coderay (1.1.0) |
| 147 |
- coffee-rails (4.1.0) |
|
| 147 |
+ coffee-rails (4.1.1) |
|
| 148 | 148 |
coffee-script (>= 2.2.0) |
| 149 |
- railties (>= 4.0.0, < 5.0) |
|
| 150 |
- coffee-script (2.3.0) |
|
| 149 |
+ railties (>= 4.0.0, < 5.1.x) |
|
| 150 |
+ coffee-script (2.4.1) |
|
| 151 | 151 |
coffee-script-source |
| 152 | 152 |
execjs |
| 153 |
- coffee-script-source (1.9.1) |
|
| 153 |
+ coffee-script-source (1.10.0) |
|
| 154 | 154 |
colorize (0.7.7) |
| 155 | 155 |
concurrent-ruby (1.0.1) |
| 156 | 156 |
cookiejar (0.3.2) |
@@ -585,7 +585,7 @@ DEPENDENCIES |
||
| 585 | 585 |
capistrano-bundler (~> 1.1.4) |
| 586 | 586 |
capistrano-rails (~> 1.1) |
| 587 | 587 |
capybara-select2 |
| 588 |
- coffee-rails (~> 4.1.0) |
|
| 588 |
+ coffee-rails (~> 4.1.1) |
|
| 589 | 589 |
coveralls |
| 590 | 590 |
daemons (~> 1.1.9) |
| 591 | 591 |
delayed_job (~> 4.1.0) |
+ 7
- 1
spec/capybara_helper.rb
@@ -2,7 +2,13 @@ require 'rails_helper' |
||
| 2 | 2 |
require 'capybara/rails' |
| 3 | 3 |
require 'capybara/poltergeist' |
| 4 | 4 |
require 'capybara-select2' |
| 5 |
+ |
|
| 6 |
+Capybara.register_driver :poltergeist do |app| |
|
| 7 |
+ Capybara::Poltergeist::Driver.new(app, timeout: 60) |
|
| 8 |
+end |
|
| 9 |
+ |
|
| 5 | 10 |
Capybara.javascript_driver = :poltergeist |
| 11 |
+Capybara.default_max_wait_time = 60 |
|
| 6 | 12 |
|
| 7 | 13 |
RSpec.configure do |config| |
| 8 | 14 |
config.include Warden::Test::Helpers |
@@ -17,4 +23,4 @@ end |
||
| 17 | 23 |
|
| 18 | 24 |
VCR.configure do |config| |
| 19 | 25 |
config.ignore_localhost = true |
| 20 |
-end |
|
| 26 |
+end |